Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 22 Jan 2010 20:40:56 +0000 (15:40 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 22 Jan 2010 20:40:56 +0000 (15:40 -0500)
commit7e280aeca88ada65b58f7181e75a1e2448b7c99c
treef6896bfe54eb2e483aa8fd0bc58898df77f39811
parent64adef08917fb2f6dd6c21fb72e686e6a7e69bbf
parent9ee76d573695c01e00fee6ebfc9990e01d5c60e0
Merge from mainline.